broadway: Add gdkbroadwaydisplay.h include

diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index d0186ff54f4a665ac687cd7876506a940e78fc68..ec482e98c4045c01e57504016d0157c79be43825 100644 (file)
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -24,6 +24,7 @@ libgdkinclude_HEADERS =       \
        gdkbroadway.h
 
 libgdkbroadwayinclude_HEADERS =        \
+       gdkbroadwaydisplay.h            \
        gdkbroadwaywindow.h             \
        gdkbroadwaycursor.h             \
        gdkbroadwayvisual.h

diff --git a/gdk/broadway/gdkbroadway.h b/gdk/broadway/gdkbroadway.h
index 792dfafda63134b1ddbb9cb05049613c5cfd5ff0..6c646585f0ce6e7bb31cf5c50e73ae3122a41bda 100644 (file)
--- a/gdk/broadway/gdkbroadway.h
+++ b/gdk/broadway/gdkbroadway.h
@@ -29,6 +29,7 @@
 
 #define __GDKBROADWAY_H_INSIDE__
 
+#include <gdk/broadway/gdkbroadwaydisplay.h>
 #include <gdk/broadway/gdkbroadwaywindow.h>
 #include <gdk/broadway/gdkbroadwaycursor.h>
 #include <gdk/broadway/gdkbroadwayvisual.h>

diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h
new file mode 100644 (file)
index 0000000..805e1de
--- /dev/null
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -0,0 +1,48 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2013 Alexander Larsson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_BROADWAY_DISPLAY_H__
+#define __GDK_BROADWAY_DISPLAY_H__
+
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
+#endif
+
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+#ifdef GDK_COMPILATION
+typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay;
+#else
+typedef GdkDisplay GdkBroadwayDisplay;
+#endif
+typedef struct _GdkBroadwayDisplayClass GdkBroadwayDisplayClass;
+
+#define GDK_TYPE_BROADWAY_DISPLAY              (gdk_broadway_display_get_type())
+#define GDK_BROADWAY_DISPLAY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplay))
+#define GDK_BROADWAY_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplayClass))
+#define GDK_IS_BROADWAY_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_BROADWAY_DISPLAY))
+#define GDK_IS_BROADWAY_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DISPLAY))
+#define GDK_BROADWAY_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplayClass))
+
+GDK_AVAILABLE_IN_ALL
+GType                   gdk_broadway_display_get_type            (void);
+
+G_END_DECLS
+
+#endif /* __GDK_BROADWAY_DISPLAY_H__ */

diff --git a/gdk/broadway/gdkdisplay-broadway.h b/gdk/broadway/gdkdisplay-broadway.h
index b249e806e8bdf46dda24146c4f30ecfbbb048b8b..401ac6fa9326d5c07bfe52bcff339e3b06be399f 100644 (file)
--- a/gdk/broadway/gdkdisplay-broadway.h
+++ b/gdk/broadway/gdkdisplay-broadway.h
@@ -22,6 +22,8 @@
 #ifndef __GDK_BROADWAY_DISPLAY__
 #define __GDK_BROADWAY_DISPLAY__
 
+#include "gdkbroadwaydisplay.h"
+
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
 #include "gdkwindow.h"
@@ -31,16 +33,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay;
-typedef struct _GdkBroadwayDisplayClass GdkBroadwayDisplayClass;
-
-#define GDK_TYPE_BROADWAY_DISPLAY              (gdk_broadway_display_get_type())
-#define GDK_BROADWAY_DISPLAY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplay))
-#define GDK_BROADWAY_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplayClass))
-#define GDK_IS_BROADWAY_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_BROADWAY_DISPLAY))
-#define GDK_IS_BROADWAY_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DISPLAY))
-#define GDK_BROADWAY_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DISPLAY, GdkBroadwayDisplayClass))
-
 struct _GdkBroadwayDisplay
 {
   GdkDisplay parent_instance;
@@ -75,8 +67,6 @@ struct _GdkBroadwayDisplayClass
   GdkDisplayClass parent_class;
 };
 
-GType      gdk_broadway_display_get_type            (void);
-
 G_END_DECLS
 
 #endif                         /* __GDK_BROADWAY_DISPLAY__ */